projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaa493d
)
(ediff-get-meta-info): Take into account that data
author
Gerd Moellmann
<gerd@gnu.org>
Wed, 12 Sep 2001 14:00:41 +0000
(14:00 +0000)
committer
Gerd Moellmann
<gerd@gnu.org>
Wed, 12 Sep 2001 14:00:41 +0000
(14:00 +0000)
from `ediff-meta-info' properties need not be an overlay. From
David Ponce <dponce@voila.fr>.
lisp/ediff-mult.el
patch
|
blob
|
history
diff --git
a/lisp/ediff-mult.el
b/lisp/ediff-mult.el
index 85ac72ee4649b02d442a99709f434e21feb8cef9..83ed80b74b2307ed1b405b7aceaf8cd98032cd48 100644
(file)
--- a/
lisp/ediff-mult.el
+++ b/
lisp/ediff-mult.el
@@
-1968,7
+1968,8
@@
If this is a session registry buffer then just bury it."
olist))
(while (and olist
(or (null (car olist))
- (overlay-get (car olist) 'invisible)))
+ (and (overlayp (car olist))
+ (overlay-get (car olist) 'invisible))))
(setq olist (cdr olist)))
(setq result (car olist)))))
(if result